unset the GTK_REALIZED flag so we don't re-enter when we are destroyed

2001-11-01  Michael Meeks  <michael@ximian.com>

	* gtk/gtksocket.c (gtk_socket_unrealize): unset the
	GTK_REALIZED flag so we don't re-enter when we are
	destroyed from the plug side.

diff --git a/ChangeLog b/ChangeLog
index 4a18077772461264ff587d58b7bd4d8bd4f9aad7..a21b7e218a95d6bb37b379ac124f2c973b117e9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-01  Michael Meeks  <michael@ximian.com>
+
+       * gtk/gtksocket.c (gtk_socket_unrealize): unset the
+       GTK_REALIZED flag so we don't re-enter when we are
+       destroyed from the plug side.
+
 Wed Oct 31 18:23:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4a18077772461264ff587d58b7bd4d8bd4f9aad7..a21b7e218a95d6bb37b379ac124f2c973b117e9f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-11-01  Michael Meeks  <michael@ximian.com>
+
+       * gtk/gtksocket.c (gtk_socket_unrealize): unset the
+       GTK_REALIZED flag so we don't re-enter when we are
+       destroyed from the plug side.
+
 Wed Oct 31 18:23:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4a18077772461264ff587d58b7bd4d8bd4f9aad7..a21b7e218a95d6bb37b379ac124f2c973b117e9f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-11-01  Michael Meeks  <michael@ximian.com>
+
+       * gtk/gtksocket.c (gtk_socket_unrealize): unset the
+       GTK_REALIZED flag so we don't re-enter when we are
+       destroyed from the plug side.
+
 Wed Oct 31 18:23:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4a18077772461264ff587d58b7bd4d8bd4f9aad7..a21b7e218a95d6bb37b379ac124f2c973b117e9f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-11-01  Michael Meeks  <michael@ximian.com>
+
+       * gtk/gtksocket.c (gtk_socket_unrealize): unset the
+       GTK_REALIZED flag so we don't re-enter when we are
+       destroyed from the plug side.
+
 Wed Oct 31 18:23:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4a18077772461264ff587d58b7bd4d8bd4f9aad7..a21b7e218a95d6bb37b379ac124f2c973b117e9f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-11-01  Michael Meeks  <michael@ximian.com>
+
+       * gtk/gtksocket.c (gtk_socket_unrealize): unset the
+       GTK_REALIZED flag so we don't re-enter when we are
+       destroyed from the plug side.
+
 Wed Oct 31 18:23:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4a18077772461264ff587d58b7bd4d8bd4f9aad7..a21b7e218a95d6bb37b379ac124f2c973b117e9f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-11-01  Michael Meeks  <michael@ximian.com>
+
+       * gtk/gtksocket.c (gtk_socket_unrealize): unset the
+       GTK_REALIZED flag so we don't re-enter when we are
+       destroyed from the plug side.
+
 Wed Oct 31 18:23:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4a18077772461264ff587d58b7bd4d8bd4f9aad7..a21b7e218a95d6bb37b379ac124f2c973b117e9f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-11-01  Michael Meeks  <michael@ximian.com>
+
+       * gtk/gtksocket.c (gtk_socket_unrealize): unset the
+       GTK_REALIZED flag so we don't re-enter when we are
+       destroyed from the plug side.
+
 Wed Oct 31 18:23:47 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkoptionmenu.c (gtk_option_menu_detacher): 

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 0b6661c03d078fa2fe8864e537f98b279e69520e..c8802c2e6ac32f54eb55268a103fd1e7fbd72b4c 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -340,6 +340,8 @@ gtk_socket_unrealize (GtkWidget *widget)
 {
   GtkSocket *socket = GTK_SOCKET (widget);
 
+  GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
+
   if (socket->plug_widget)
     {
       _gtk_plug_remove_from_socket (GTK_PLUG (socket->plug_widget), socket);